Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

8283218: Update GStreamer to 1.20.1 #94

Closed
wants to merge 1 commit into from
Closed

8283218: Update GStreamer to 1.20.1 #94

wants to merge 1 commit into from

Conversation

kevinrushforth
Copy link
Member

@kevinrushforth kevinrushforth commented Apr 30, 2022 •
edited by openjdk bot

Backport to jfx11u. Tested in connection with libffi update in the test-kcr-11.0.16 branch.

This was not a clean backport, but the merge conflicts were trivial to resolve. Here is a summary of the changes. The jfx mainline patch applied cleanly to all other files.

  1. The following file is not present in jfx11u, so that part of the patch was skipped:
modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-good/gst/audioparsers/gstaacparse.c
  1. The following files had minor merge conflicts, the first was a diff in surrounding context and the rest were in copyright header blocks:
modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile
modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile
modules/javafx.media/src/tools/native/def-glib.pl
modules/javafx.media/src/tools/native/def-gstlite.pl

Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issues

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jfx11u pull/94/head:pull/94
$ git checkout pull/94

Update a local copy of the PR:
$ git checkout pull/94
$ git pull https://git.openjdk.java.net/jfx11u pull/94/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 94

View PR using the GUI difftool:
$ git pr show -t 94

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jfx11u/pull/94.diff

@kevinrushforth
8283218: Update GStreamer to 1.20.1
71d1bcb 
8283403: Update Glib to 2.72.0

Reviewed-by: jvos, kcr
@bridgekeeper
Copy link

bridgekeeper bot commented Apr 30, 2022

👋 Welcome back kcr! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk openjdk bot changed the title Backport c4b1a72cc4d9253d1320d83281d50fb1f3bb6145 8283218: Update GStreamer to 1.20.1 Apr 30, 2022
@openjdk
Copy link

openjdk bot commented Apr 30, 2022

This backport pull request has now been updated with issues from the original commit.

@openjdk openjdk bot added backport rfr Ready for review labels Apr 30, 2022
@kevinrushforth
Copy link
Member Author

Reviewer: @johanvos

@mlbridge
Copy link

mlbridge bot commented Apr 30, 2022

Webrevs

@openjdk
Copy link

openjdk bot commented Apr 30, 2022

@kevinrushforth This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8283218: Update GStreamer to 1.20.1
8283403: Update Glib to 2.72.0

Reviewed-by: jvos

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 2 new commits pushed to the master branch:

  • e92f7fc: 8276142: Update gradle to version 7.3
  • 1e62db9: 8273998: Clarify specification for Window properties controlled by the window manager

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready Ready to be integrated label Apr 30, 2022
@kevinrushforth
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented May 2, 2022

Going to push as commit d0df847.
Since your change was applied there have been 5 commits pushed to the master branch:

  • 1e4862f: 8280840: Update libFFI to 3.4.2
  • 44e691e: 8274274: Update JUnit to version 5.8.1
  • e877f30: 8281564: Update cmake to 3.22.3
  • e92f7fc: 8276142: Update gradle to version 7.3
  • 1e62db9: 8273998: Clarify specification for Window properties controlled by the window manager

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label May 2, 2022
@openjdk openjdk bot closed this May 2, 2022
@openjdk openjdk bot removed ready Ready to be integrated rfr Ready for review labels May 2, 2022
@openjdk
Copy link

openjdk bot commented May 2, 2022

@kevinrushforth Pushed as commit d0df847.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

@kevinrushforth kevinrushforth deleted the 8283218-gstreamer-1.20.1 branch May 2, 2022 13:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@johanvos johanvos johanvos approved these changes

Assignees
No one assigned
Labels
backport integrated Pull request has been integrated
Milestone
No milestone
2 participants
@kevinrushforth @johanvos